Actually group the actions together rather than putting each in its own

2003-08-29  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): Actually group the actions
	together rather than putting each in its own group.

diff --git a/ChangeLog b/ChangeLog
index 34999ddd866afef802a2a1d4d0163da7692c30bb..299a288b47c3c208b6e462091a872527b77c3ad3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-08-29  Matthias Clasen  <maclas@gmx.de>
 
+       * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): Actually group the actions
+       together rather than putting each in its own group.
+
        * gtk/gtkradioaction.c (create_menu_item): Set "draw_as_radio" on proxy menu items
        for radio actions.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 34999ddd866afef802a2a1d4d0163da7692c30bb..299a288b47c3c208b6e462091a872527b77c3ad3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2003-08-29  Matthias Clasen  <maclas@gmx.de>
 
+       * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): Actually group the actions
+       together rather than putting each in its own group.
+
        * gtk/gtkradioaction.c (create_menu_item): Set "draw_as_radio" on proxy menu items
        for radio actions.
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 34999ddd866afef802a2a1d4d0163da7692c30bb..299a288b47c3c208b6e462091a872527b77c3ad3 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,8 @@
 2003-08-29  Matthias Clasen  <maclas@gmx.de>
 
+       * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): Actually group the actions
+       together rather than putting each in its own group.
+
        * gtk/gtkradioaction.c (create_menu_item): Set "draw_as_radio" on proxy menu items
        for radio actions.
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 34999ddd866afef802a2a1d4d0163da7692c30bb..299a288b47c3c208b6e462091a872527b77c3ad3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2003-08-29  Matthias Clasen  <maclas@gmx.de>
 
+       * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): Actually group the actions
+       together rather than putting each in its own group.
+
        * gtk/gtkradioaction.c (create_menu_item): Set "draw_as_radio" on proxy menu items
        for radio actions.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 34999ddd866afef802a2a1d4d0163da7692c30bb..299a288b47c3c208b6e462091a872527b77c3ad3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2003-08-29  Matthias Clasen  <maclas@gmx.de>
 
+       * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): Actually group the actions
+       together rather than putting each in its own group.
+
        * gtk/gtkradioaction.c (create_menu_item): Set "draw_as_radio" on proxy menu items
        for radio actions.
 

diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c
index 235ee71493ca76a403262d07dbb817f06f715e84..4159d2afae6b850c198f4ad9789bd01cf0f34d5f 100644 (file)
--- a/gtk/gtkactiongroup.c
+++ b/gtk/gtkactiongroup.c
@@ -425,6 +425,7 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup      *action_group,
   guint i;
   GtkTranslateFunc translate_func;
   gpointer translate_data;
+  GSList *group = NULL;
 
   g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
 
@@ -464,11 +465,8 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup      *action_group,
                                   on_change, user_data, 
                                   (GClosureNotify)destroy, 0);
        }
-      else
-       {
-         GSList *group = gtk_radio_action_get_group (GTK_RADIO_ACTION (action));
-         gtk_radio_action_set_group (GTK_RADIO_ACTION (action), group);
-       }
+      gtk_radio_action_set_group (GTK_RADIO_ACTION (action), group);
+      group = gtk_radio_action_get_group (GTK_RADIO_ACTION (action));
 
       /* set the accel path for the menu item */
       accel_path = g_strconcat ("<Actions>/", action_group->private_data->name, "/",